Warning fixes.

diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c
index a0ccebe2cd99ff1656cec6647f66456f10a4b972..e9a3671ad5af2d2ab80b579f026405c65696974f 100644 (file)
--- a/gpsbabel/gdb.c
+++ b/gpsbabel/gdb.c
@@ -31,6 +31,7 @@
                        new option "via"
                        new option "ver"
                        fixed compiler warnings
+           2005/07/29: fixed compiler warnings
 */
 
 #include <stdio.h>
@@ -407,7 +408,6 @@ void
 gdb_is_validf(int is, const char *prefix, const char *format, ...)
 {
        va_list args;
-       char buff[256];
        
        if (is != 0) return;
        
@@ -416,12 +416,11 @@ gdb_is_validf(int is, const char *prefix, const char *format, ...)
            printf(MYNAME "-%s: Reading from database \"%s\"\n", prefix, fin_name);
        else
            printf(MYNAME "-%s: Writing to database \"%s\"\n", prefix, fout_name);
-       printf(MYNAME "-%s: ");
+       printf(MYNAME "-%s: ", prefix);
        vprintf(format, args);
-       puts("");
-       
        va_end(args);
-       fatal("");
+
+       fatal("\n");
 }
 
 /********************************************************************************************************/
@@ -648,7 +647,7 @@ gdb_read_route(void)
        
        char buff[256];
        int count, origin;
-       int isteps, ilink;
+       int isteps;
        int semilat, semilon;
        int maxlat, maxlon, minlon, minlat;
        char auto_name;
@@ -1140,9 +1139,9 @@ gdb_write_file_header(const struct tm *tm)
 #if 0
        strncpy(buff, "A].SQA*Dec 27 2004*17:40:51", sizeof(buff));             /* MapSource V6.5 */
 #else
-       /* This is our "Watermark" to show this file was not created by MapSource */
+       /* This is our "Watermark" to show this file was created by GPSbabel */
        /* !!! We should define the date use through Makefile !!! */
-       strncpy(buff, "A].GPSBabel*Jul 29 2005*09:52:51", sizeof(buff));        /* gpsbabel V1.2.6 */
+       strncpy(buff, "A].GPSBabel_1.2.6*Jul 29 2005*21:37:51", sizeof(buff));  /* gpsbabel V1.2.6 */
 #endif
        len = strlen(buff);
        buff[2] = 2;

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index 72175dc4747949155639b7fdad1e19873b7aecbc..dbfeddd1960dd7f38effe76883b98af156fd097c 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -25,6 +25,7 @@
     2005-07-26: implemented range option
     2005-07-26: implemented move option
     2005-07-26: implemented merge option
+    2005-07-29: warning fixes
  */
  
 #include <stdio.h>
@@ -180,7 +181,7 @@ trackfilter_fill_track_list_cb(const route_head *track)     /* callback for track_d
        
        if (track->rte_waypt_ct == 0) 
        {
-           track_del_head(track);
+           track_del_head((route_head *)track);
            return;
        }